From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 5 Oct 2011 08:28:11 +0000 (-0400)
Subject: StThemeNodeDrawing: Remove useless LoadCornerData
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~7498
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=f9b37a21e88df95768462f75b2d153d3679a2aea;p=gnome-shell.git

StThemeNodeDrawing: Remove useless LoadCornerData

Done as part of my quest to merge Mx and St:

https://github.com/magcius/mx/tree/st-rebase

https://bugzilla.gnome.org/show_bug.cgi?id=660968
---

diff --git a/src/st/st-theme-node-drawing.c b/src/st/st-theme-node-drawing.c
index 3e7d86f4e..b4d9e900e 100644
--- a/src/st/st-theme-node-drawing.c
+++ b/src/st/st-theme-node-drawing.c
@@ -189,20 +189,13 @@ corner_to_string (StCornerSpec *corner)
                           corner->border_width_2);
 }
 
-typedef struct {
-  StThemeNode *node;
-  StCornerSpec *corner;
-} LoadCornerData;
-
 static CoglHandle
 load_corner (StTextureCache  *cache,
              const char      *key,
              void            *datap,
              GError         **error)
 {
-  LoadCornerData *data = datap;
-
-  return create_corner_material (data->corner);
+  return create_corner_material ((StCornerSpec *) datap);
 }
 
 /* To match the CSS specification, we want the border to look like it was
@@ -347,7 +340,6 @@ st_theme_node_lookup_corner (StThemeNode    *node,
   char *key;
   StTextureCache *cache;
   StCornerSpec corner;
-  LoadCornerData data;
   guint radius[4];
 
   if (node->border_radius[corner_id] == 0)
@@ -388,10 +380,7 @@ st_theme_node_lookup_corner (StThemeNode    *node,
     return COGL_INVALID_HANDLE;
 
   key = corner_to_string (&corner);
-
-  data.node = node;
-  data.corner = &corner;
-  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &data, NULL);
+  texture = st_texture_cache_load (cache, key, ST_TEXTURE_CACHE_POLICY_NONE, load_corner, &corner, NULL);
   material = _st_create_texture_material (texture);
   cogl_handle_unref (texture);